da850/omap-l138: Make MMC and NOR support mutually exclusive

On Logic PD Rev.3 DA850/OMAP-L138 EVM, NOR and MMC/SD cannot
work together. This patch enables the MMC/SD support only
when NOR support is disabled. NOR Flash identification works
even without this patch, but erase and write will have issues.

Tested-by: Christian Riesch <[email protected]>
Signed-off-by: Rajashekhara, Sudhakar <[email protected]>
Signed-off-by: Lad, Prabhakar <[email protected]>
Signed-off-by: Hadli, Manjunath <[email protected]>

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index dfbc6740646e07d3e0af41de83da0f6ed75e72fe..054d64a8c97ef8d87ef475f92d02b4a81063689e 100644 (file)
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -312,10 +312,12 @@
 #endif
 
 /* SD/MMC configuration */
+#ifndef CONFIG_USE_NOR
 #define CONFIG_MMC
 #define CONFIG_DAVINCI_MMC_SD1
 #define CONFIG_GENERIC_MMC
 #define CONFIG_DAVINCI_MMC
+#endif
 
 /*
  * Enable MMC commands only when